Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 12 May 2010 02:08:23 +0000 (02:08 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 12 May 2010 02:08:23 +0000 (02:08 +0000)
commite20f5449ac2fa181f439494f4725062c19ce198d
treef870b696f6e613a29b9e9199c2d9f9667927e3a9
parentaf54feda8e861881c9e275cd74d5633625c82909
parent38200af1291310801102ed623d5dc2c7676cc07f
Merge from mainline.